Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 19 Aug 2010 00:35:46 +0000 (00:35 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 19 Aug 2010 00:35:46 +0000 (00:35 +0000)

Trivial merge